admin: Fix list of subcommands in help and manpage

This adds subcommands that were missing from the ostree-admin man page,
and makes cosmetic fixes there and in the --help output to ensure
alphabetical order and remove trailing whitespace.

Closes: #1621
Approved by: jlebon

diff --git a/man/ostree-admin.xml b/man/ostree-admin.xml
index 53d07db5726907d4e23935e4ea1582513957fa74..5dc814665736d4ea7a8a36fd5277cb22dcd095e8 100644 (file)
--- a/man/ostree-admin.xml
+++ b/man/ostree-admin.xml
@@ -73,11 +73,13 @@ Boston, MA 02111-1307, USA.
             <listitem><para><command>init-fs</command></para></listitem>
             <listitem><para><command>instutil</command></para></listitem>
             <listitem><para><command>os-init</command></para></listitem>
-            <listitem><para><command>status</command></para></listitem>
+            <listitem><para><command>pin</command></para></listitem>
             <listitem><para><command>set-origin</command></para></listitem>
+            <listitem><para><command>status</command></para></listitem>
             <listitem><para><command>switch</command></para></listitem>
             <listitem><para><command>undeploy</command></para></listitem>
-            <listitem><para><command>upgrade</command></para></listitem>            
+            <listitem><para><command>unlock</command></para></listitem>
+            <listitem><para><command>upgrade</command></para></listitem>
         </itemizedlist>
 
         <para>

diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index b26eea8157c66f91bcd751c882e0604d737c6975..9f1a61562a8234bd49a2e116cfcede0944f59ef9 100644 (file)
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -42,6 +42,9 @@ static OstreeCommand admin_subcommands[] = {
   { "deploy", OSTREE_BUILTIN_FLAG_NO_REPO,
     ot_admin_builtin_deploy,
     "Checkout revision REFSPEC as the new default deployment" },
+  { "finalize-staged", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
+    ot_admin_builtin_finalize_staged,
+    "Internal command to run at shutdown time" },
   { "init-fs", OSTREE_BUILTIN_FLAG_NO_REPO,
      ot_admin_builtin_init_fs,
     "Initialize a root filesystem" },
@@ -51,15 +54,12 @@ static OstreeCommand admin_subcommands[] = {
   { "os-init", OSTREE_BUILTIN_FLAG_NO_REPO,
     ot_admin_builtin_os_init,
     "Initialize empty state for given operating system" },
-  { "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_set_origin,
-    "Set Origin and create a new origin file" },
   { "pin", OSTREE_BUILTIN_FLAG_NO_REPO,
     ot_admin_builtin_pin,
     "Change the \"pinning\" state of a deployment" },
-  { "finalize-staged", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
-    ot_admin_builtin_finalize_staged,
-    "Internal command to run at shutdown time" },
+  { "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO,
+    ot_admin_builtin_set_origin,
+    "Set Origin and create a new origin file" },
   { "status", OSTREE_BUILTIN_FLAG_NO_REPO,
     ot_admin_builtin_status,
     "List deployments" },